From b7a628348d46cf35afa6bdb385bbe611901e58d3 Mon Sep 17 00:00:00 2001 From: Dimitrios Eftaxiopoulos Date: Fri, 20 Apr 2012 13:50:51 +0300 Subject: [PATCH] Built after selecting all features individually --- CMakeLists.txt | 30 ++++++++-------- debian/mathgl-doc-en.install | 6 ++-- debian/patches/CMakeLists-txt.patch | 44 +++++++++++++++++++----- debian/patches/lang-CMakeLists-txt.patch | 11 ++++++ debian/patches/series | 1 + lang/CMakeLists.txt | 2 +- 6 files changed, 66 insertions(+), 28 deletions(-) create mode 100644 debian/patches/lang-CMakeLists-txt.patch diff --git a/CMakeLists.txt b/CMakeLists.txt index 1791eaf..94e8fc9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,24 +9,24 @@ option(enable-double "Enable double precision in MathGL library" ON) option(enable-all "Enable all features" ON) option(enable-langall "Enable all language interfaces" ON) option(enable-lgpl "Enable only LGPL part of MathGL" OFF) -option(enable-ltdl "Enable loading modules support") -option(enable-pthread "Enable POSIX threads support") -option(enable-gsl "Enable gsl support") -option(enable-jpeg "Enable jpeg support") +option(enable-ltdl "Enable loading modules support" ON) +option(enable-pthread "Enable POSIX threads support" ON) +option(enable-gsl "Enable gsl support" ON) +option(enable-jpeg "Enable jpeg support" ON) #option(enable-u3d "Enable u3d support") -option(enable-pdf "Enable pdf support") -option(enable-gif "Enable gif support") -option(enable-hdf4 "Enable hdf4 support") +option(enable-pdf "Enable pdf support" ON) +option(enable-gif "Enable gif support" ON) +option(enable-hdf4 "Enable hdf4 support" ON) option(enable-hdf5 "Enable hdf5 1.6 support" OFF) -option(enable-hdf5_18 "Enable hdf5 1.8 support") +option(enable-hdf5_18 "Enable hdf5 1.8 support" ON) option(enable-opengl "Enable OpenGL support" ON) -option(enable-glut "Enable glut support") -option(enable-fltk "Enable fltk widget") -option(enable-wx "Enable wxWidget widget") -option(enable-qt "Enable Qt4 widget") -option(enable-python "Enable python interface") -option(enable-octave "Enable octave interface") -option(enable-doc "Enable documentation building") +option(enable-glut "Enable glut support" ON) +option(enable-fltk "Enable fltk widget" ON) +option(enable-wx "Enable wxWidget widget" ON) +option(enable-qt "Enable Qt4 widget" ON) +option(enable-python "Enable python interface" ON) +option(enable-octave "Enable octave interface" ON) +option(enable-doc "Enable documentation building" ON) include_directories( ${MathGL_SOURCE_DIR}/include ${MathGL_BINARY_DIR}/include) diff --git a/debian/mathgl-doc-en.install b/debian/mathgl-doc-en.install index afd8e72..2682855 100644 --- a/debian/mathgl-doc-en.install +++ b/debian/mathgl-doc-en.install @@ -1,10 +1,10 @@ debian/tmp/usr/share/doc/mathgl/*.png debian/tmp/usr/share/doc/mathgl/*.html debian/tmp/usr/share/doc/mathgl/*.pdf -debian/tmp/usr/share/doc/mathgl/small/*.png -debian/tmp/usr/share/doc/mathgl/png/*.png +debian/tmp/usr/share/doc/mathgl/small/* +debian/tmp/usr/share/doc/mathgl/png/* debian/tmp/usr/share/doc/mathgl/mathgl_en.info* usr/share/info/ -debian/tmp/usr/share/doc/mathgl/mgl_web_en/* +debian/tmp/usr/share/doc/mathgl/doc_en/* debian/tmp/usr/share/doc/mathgl/web_en/* debian/tmp/usr/share/doc/mathgl/mathgl_en/* debian/folder/mathgl-doc-en /usr/share/doc-base/ \ No newline at end of file diff --git a/debian/patches/CMakeLists-txt.patch b/debian/patches/CMakeLists-txt.patch index 03deede..1c83332 100644 --- a/debian/patches/CMakeLists-txt.patch +++ b/debian/patches/CMakeLists-txt.patch @@ -1,6 +1,6 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -5,9 +5,9 @@ +@@ -5,28 +5,28 @@ set(MathGL_VERSION_MAJOR 2) set(MathGL_VERSION_MINOR 0) @@ -11,14 +11,40 @@ +option(enable-all "Enable all features" ON) +option(enable-langall "Enable all language interfaces" ON) option(enable-lgpl "Enable only LGPL part of MathGL" OFF) - option(enable-ltdl "Enable loading modules support") - option(enable-pthread "Enable POSIX threads support") -@@ -17,7 +17,7 @@ - option(enable-pdf "Enable pdf support") - option(enable-gif "Enable gif support") - option(enable-hdf4 "Enable hdf4 support") +-option(enable-ltdl "Enable loading modules support") +-option(enable-pthread "Enable POSIX threads support") +-option(enable-gsl "Enable gsl support") +-option(enable-jpeg "Enable jpeg support") ++option(enable-ltdl "Enable loading modules support" ON) ++option(enable-pthread "Enable POSIX threads support" ON) ++option(enable-gsl "Enable gsl support" ON) ++option(enable-jpeg "Enable jpeg support" ON) + #option(enable-u3d "Enable u3d support") +-option(enable-pdf "Enable pdf support") +-option(enable-gif "Enable gif support") +-option(enable-hdf4 "Enable hdf4 support") -option(enable-hdf5 "Enable hdf5 1.6 support") +-option(enable-hdf5_18 "Enable hdf5 1.8 support") ++option(enable-pdf "Enable pdf support" ON) ++option(enable-gif "Enable gif support" ON) ++option(enable-hdf4 "Enable hdf4 support" ON) +option(enable-hdf5 "Enable hdf5 1.6 support" OFF) - option(enable-hdf5_18 "Enable hdf5 1.8 support") ++option(enable-hdf5_18 "Enable hdf5 1.8 support" ON) option(enable-opengl "Enable OpenGL support" ON) - option(enable-glut "Enable glut support") +-option(enable-glut "Enable glut support") +-option(enable-fltk "Enable fltk widget") +-option(enable-wx "Enable wxWidget widget") +-option(enable-qt "Enable Qt4 widget") +-option(enable-python "Enable python interface") +-option(enable-octave "Enable octave interface") +-option(enable-doc "Enable documentation building") ++option(enable-glut "Enable glut support" ON) ++option(enable-fltk "Enable fltk widget" ON) ++option(enable-wx "Enable wxWidget widget" ON) ++option(enable-qt "Enable Qt4 widget" ON) ++option(enable-python "Enable python interface" ON) ++option(enable-octave "Enable octave interface" ON) ++option(enable-doc "Enable documentation building" ON) + + include_directories( ${MathGL_SOURCE_DIR}/include ${MathGL_BINARY_DIR}/include) + diff --git a/debian/patches/lang-CMakeLists-txt.patch b/debian/patches/lang-CMakeLists-txt.patch new file mode 100644 index 0000000..8c9e7a5 --- /dev/null +++ b/debian/patches/lang-CMakeLists-txt.patch @@ -0,0 +1,11 @@ +--- a/lang/CMakeLists.txt ++++ b/lang/CMakeLists.txt +@@ -43,7 +43,7 @@ + WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/lang + ) + add_custom_target(mgl_python_module ALL DEPENDS _mathgl.so mathgl.py) +- install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_BINARY_DIR}/lang/setup.py install --prefix=${CMAKE_INSTALL_PREFIX} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/lang )") ++ install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_BINARY_DIR}/lang/setup.py install --prefix=${CMAKE_SOURCE_DIR}/debian/tmp/usr --install-layout=deb WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/lang )") + set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "mgl_wrap.cpp;build;mathgl.pyc") + endif(MGL_HAVE_PYTHON) + diff --git a/debian/patches/series b/debian/patches/series index 4277de1..ecb3683 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ CMakeLists-txt.patch +lang-CMakeLists-txt.patch diff --git a/lang/CMakeLists.txt b/lang/CMakeLists.txt index d6467f0..e573653 100644 --- a/lang/CMakeLists.txt +++ b/lang/CMakeLists.txt @@ -43,7 +43,7 @@ if(MGL_HAVE_PYTHON) WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/lang ) add_custom_target(mgl_python_module ALL DEPENDS _mathgl.so mathgl.py) - install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_BINARY_DIR}/lang/setup.py install --prefix=${CMAKE_INSTALL_PREFIX} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/lang )") + install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_BINARY_DIR}/lang/setup.py install --prefix=${CMAKE_SOURCE_DIR}/debian/tmp/usr --install-layout=deb WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/lang )") set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "mgl_wrap.cpp;build;mathgl.pyc") endif(MGL_HAVE_PYTHON) -- 2.30.2